<<<<<<< .mine
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>Debug</title>
</head>
<body>
    <span>New Web Project Page</span>
</body>
<script type="text/javascript" src="lib/Debug.js"></script>
<script type="text/javascript">
	var init = function(){
		Debug.traces("aa");
	}
	var s = new init();
	Debug.trace("a");

</script>
</html>
=======
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd">

<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
<head>
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	<title>new_file</title>
	<meta name="author" content="Administrator" />
</head>
<script type="text/javascript" src="libs/Debug.js"></script>
<body>
<div id="status" style="width:5px">  aaa </div>
</body>
<script type="text/javascript">
window.requestAnimFrame = (function(){   
        return  window.requestAnimationFrame       ||    
        window.webkitRequestAnimationFrame ||    
        window.mozRequestAnimationFrame    ||    
        window.oRequestAnimationFrame      ||    
        window.msRequestAnimationFrame     ||    
        function( callback ){   
            window.setTimeout(callback, 1000/60);   
        };   
})();   
   
//调用   
function animationLoop(elem){   
        requestAnimFrame(animationLoop);   
}   

	
window.requestAnimFrame = (function(w, r) {    
    w['r'+r] = w['r'+r] || w['webkitR'+r] || w['mozR'+r] || w['msR'+r] || w['oR'+r] 
	|| function(c){ w.setTimeout(c, 1000 / 60); };   
    return w['r'+r];   
})(window, 'equestAnimationFrame');   
</script>
</html>

>>>>>>> .r2
